projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ea5772 90522d3)
bitkeeper revision 1.1236.1.215 (42526b63vLzmU02tqgo2T5K1cqfpBQ)
authorvh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Tue, 5 Apr 2005 10:41:39 +0000 (10:41 +0000)
committervh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Tue, 5 Apr 2005 10:41:39 +0000 (10:41 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk

1  2 
tools/python/xen/xm/main.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xm/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.